From 1a4e360c2c289a4e3cb229310f24817234cd052b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 2 Jun 2019 15:54:50 +0000 Subject: [PATCH] Don't generate mipmaps needlessly GL_LINEAR doesn't use mipmaps, so don't generate them. --- gsk/gl/gskgldriver.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c index d73575da06..276f01fc6c 100644 --- a/gsk/gl/gskgldriver.c +++ b/gsk/gl/gskgldriver.c @@ -756,6 +756,12 @@ gsk_gl_driver_init_texture_empty (GskGLDriver *self, glBindTexture (GL_TEXTURE_2D, 0); } +static gboolean +filter_uses_mipmaps (int filter) +{ + return filter != GL_NEAREST && filter != GL_LINEAR; +} + void gsk_gl_driver_init_texture_with_surface (GskGLDriver *self, int texture_id, @@ -791,6 +797,6 @@ gsk_gl_driver_init_texture_with_surface (GskGLDriver *self, t->min_filter = min_filter; t->mag_filter = mag_filter; - if (t->min_filter != GL_NEAREST) + if (filter_uses_mipmaps (t->min_filter)) glGenerateMipmap (GL_TEXTURE_2D); } -- 2.30.2